Auto merge of #1412 - jakub-:rust-nightly, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 12 Mar 2015 17:21:14 +0000 (17:21 +0000)
committerbors <bors@rust-lang.org>
Thu, 12 Mar 2015 17:21:14 +0000 (17:21 +0000)

Trivial merge